merge in master-release history after reset to cf8fb22d2bee6d7a7a73e78f7920b9f51399e00e