merge in master-release history after reset to ddfb00180a56f254857289a1b9be51556b2ac0f9