$noexport hack moved to svc_Common