#5876

This was already merged into the **merge-5729-to-master** branch.