Prep for release
Merge branch 'release/1.2.6.1'
Merge tag '1.2.6.1' into develop

Release 1.2.6.1