*8477* Fix build for submodules