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