SEQWARE-1646 and associated test