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