DAR-3146 | fixes after CR