Merge branch 'master' into develop
Fix issues reported by Boost Inspection Tool