#5862

It was already merged for master 3.0 into the branch: merge-5729-to-master