Fix bug  A47 and A51
Merge remote-tracking branch 'origin/master'