Updates for better configuration options
Bump
Merge branch 'release/1.2.6' into develop