AH-496_GUIAutoAdjust
Merge remote-tracking branch 'origin/master' into AH-496_GUIAutoAdjust