(cherry picked from commit 13c37ba2) By mistake it was cherry-picked out of order, too late
mentioned in merge request !910 (merged)