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