merge in master-release history after reset to 05edb675f9026ec836a0adee47476db8f3f4ec9a