Sync with latest changes from common/lib
Merge pull request #413 from Icenium/fatme/fix-autocompletion

Sync with latest changes from common/lib