fix A187
Merge remote-tracking branch 'origin/master'