Resolve conflicts from @RIonRyan's last commit.