[DF-2672] Fixes after review. (reverse-merged from commit d189297af69a98c300a616e2657899171ee098b0)