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