DF-4862 fixes and ne component configuration