Harmonization of the behavior of buttons  refs#563
Merge remote-tracking branch 'origin/dev' into dev