Fix the build failure from merging tmp/issue-742 & tmp/insert-or-update