merge in master-release history after reset to de4dea765aeddf8629dd8da8414bc85bb0451e0e