[ARQ-1289] Closer to getting Domain working with 7.1.1.Final