Added a fix for the Studio with unit test
Merge branch 'MasterBugFixing' into BS-7035