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

No match.