LIB001-824: Syncing recent changes
Merge pull request #170 from ianthe/LIB001-824

LIB001-824: Syncing recent changes