[DF-2762] Intermediate changes. (reverse-merged from commit 8493a59d012c1c1bdab409ea809e3172fa27cfac)