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