merge in master-release history after reset to 136f00c23463996f979db92d28572b031ea3ad4e