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