This change should also take place in both branches (i.e., not in this PR)