Propagated fix [ENSCORESW-840]