DB-728 fix FT-584 on the 7.1.7 branch