Aq 4585 use the common submodule