Not sure why these weren't in the previous Merge commit.