[dali_1.2.26] Merge branch 'devel/master'