Solves issues CNTCTI-148, CNTCTI-154 and CNTCTI-120