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