[UPDATE] submodule updates and required changes