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