Updating with outstanding pull requests from base modules
Merge pull request #1 from tccltd/production

Updating with outstanding pull requests from base modules