ERT-753: Big heap of changes