Merge branch 'release/1.2.8'
Merge branch 'master' into develop