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