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