Followup MR for MR 6663

What does this MR do?

This MR is a followup to !6663 (merged). See !6663 (comment 3274474442) for more information.

Why was this MR needed?

What's the best way to test this MR?

What are the relevant issue numbers?