merge in master-release history after reset to af14b354bc958d08df4df78d5bb00a8aaad82f2c