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