Merge for issue #12484