Adding changes which were meant to go into a recent commit.