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