Partly reverted erroneous merge (3ab5aeb5443e274d70c5bf455e7e058a14c48626)