merge in master-release history after reset to 0de529b4cac458b2d561060d3ae2c7f7f82b676d