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