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