merge in master-release history after reset to 978d30d0e046c971b37a6fc20480615f1c55f55c