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