[dali_1.2.21] Merge branch 'devel/master'