Merge branch 'fix-1.2'