[ARQ-1289] Fix non-domain clients to AS 7.1.1.Final