merge in master-release history after reset to dc1e70b379415531aa4344bceca299f9ca662444