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