DF-3431 (reverse-merged from commit 8658cd7db0dff972d9b2d2028647155f3e7f51ce)