Sync common lib with latest changes

Sync common lib with latest changes