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