Merge commit 'd1353cc4f14a9bed49b04b0c3a6fd57784102465' * commit 'd1353cc4f14a9bed49b04b0c3a6fd57784102465': Fixes #1873537.