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