merge in master-release history after reset to 3a1c29b106f8ef4e8aba2bf0c722f3650c6f255c