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