ver. 2.0.2.7 BITS-217
Merge branch 'HotFix_master'