[dali_2.1.0] Merge branch 'devel/master'

No match.