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