merge in master-release history after reset to d2275ef1ce68712057a37f6966cf2a962f8094f4