Completed and Tested #180 (Pull latest core-common-lib master)