merge in master-release history after reset to 6020ea4ec166f2a168c8ecf73a9a605169838da1