CON-1815 | A bit more changes