merge in master-release history after reset to 3b0d098df111647eb60d9747b6bc81760d5781b1