This commit amends 4eefd27f. Changes were pushed to the wrong branch, so the MR got merged not in its final state. (cherry picked from commit 574b51f0)