DF-4916 and some minor fixes