merge in master-release history after reset to 8de92f8c5f349048c7819bfc73860ff5ed0e141b