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