merge in master-release history after reset to 88b7e4338e986aa896eaee6cf88a645f3a1598f8