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