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

No match.