Integrated suggestions by @traversaro
Merge remote-tracking branch 'origin/development' into development