Checkpoint commit.
Merging remote mmal/dev with local dev branch