Merge branch 'release/1.2.12-pre2'