merge in master-release history after reset to 7a2d83f22a1103f9077c5e641130442b7b509e5b