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