[dali_2.0.36] Merge branch 'devel/master'