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