[DF-590]. Fix for DF-706