Added a fix for the Studio with unit test
Merge branch '6.2.x' into 'FT2427_RepairAPI_6_2_x'