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