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