[DF-185] Ready for merge