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