fixes after mergind dev to DAR-1727