Manual merge new features from curtinmartis repo
Merge pull request #1 from nrmldotcom/cm-naa41-update

Manual merge new features from curtinmartis repo