merge in master-release history after reset to 305778b53a5e7c865cae4010e657d00bb9bf5075