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