[BUG #7866] Removed inter-module dependency