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