Merge tag '1.2.7' into develop

Release v1.2.7
Cleanup
rp
Merge branch 'release/1.2.8'