merge in master-release history after reset to c7b2a0e30aba4505a041a9ad0f8889f4891d30f8