Refacto
Merge branch 'develop'
Merge branch 'master' into 2.6