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