Merge branch 'release/1.2.22' into develop
centralize directories
Merge branch 'release/1.2.23'