merge in master-release history after reset to 78ae0ad8df1773cda70a5d27b826408d60b25c7b