merge w/ 3.3 for issue #18055