Fix bug  A78  A79
Merge remote-tracking branch 'origin/master'