Merge branch 'master' into div_mod_ops_impl