bug fix master
Merge branch 'master' into r2_master

Bug Fixed