Sync with latest common lib
Merge pull request #628 from Icenium/fatme/sync-with-latest-common-lib

Sync with latest common lib