ETRO-48 added logging