ERT-562: Changes after review