Checked in missing solution changes from last commit.