Merge 2.x fixes