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