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