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