Cherry pick 6.1.x fixes