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