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