Merge 1.2.x fixes