merge in master-release history after reset to 77a3374a6170fb5f0168169bc4bc3fa9baf318eb