DF-4914 review fixes