from minor_fix with AUG, JET and NBI changes in master
This tag has no release notes.