SONARVS-40 Attempt to restore compatbility with SQ LTS