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