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

No match.