This commit amends 9897afa5. Changes were pushed to the wrong branch, so the MR got merged not in its final state.
mentioned in commit d14e7d8e