Merge branch 'release/1.2.5' into develop
Updates for better configuration options
Bump
-am