[dali_2.0.1] Merge branch 'devel/master'