Merge branch 'current_dev'
Merge branch 'master' into current_dev