Merge branch '6.2.x' into 'FT2427_RepairAPI_6_2_x'
Merge branch 'FT2427_RepairAPI_6_2_x' into '6.2.x'