Committing 1.12.x unstable branch