Merge branch 'release/1.3.12-pre3'