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