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