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