Checkpoint commit.
Merged from master