Code clean up
Bump
Merge branch 'release/1.2.15' into develop