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