DF-4536 final fixes