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