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