Merge branch 'merge-util-master'