Sync with latest changes made on kb repository