merge in master-release history after reset to abcb99927d9ad3f66288a5ce16d7c86c14b49249