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