Merge branch 'master' into salsubaiee/master_change_materialize_op