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