merge in master-release history after reset to 35acf309b7ecbe6741782ee635d6048b10dd4308