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