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