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