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