merge in master-release history after reset to 68831f852e5eed79c0f4ef83895e5f62e4fb138f