forgot to add this for the previous fix
Merge branch '1.12'