v10.4.2
410c5623 · Merge pull request #13756 from mszeszko-meta/backport_13609_to_10.4 ·