AD-5 #comment fixed on 1_0_X
Merge remote-tracking branch 'remotes/origin/1_0_X'