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