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