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