[DF-1213] fixed. (reverse-merged from commit 714a665d813c5346e132a7fcd688d39346be033f)