Sync with latest changes in submodule