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