DB-731 Fix FT-586 on the 7.1.7 branch