Merge cm12.0 branch commits from @percy-g2