EDOC-1218: improvements related to logging, fixing logging issues