LIB001-824: Syncing recent changes