small tune Stage3
Merge remote-tracking branch 'minimo/Stage3' into develop
bug fix