Change request #553: ENC-2526-LIDO