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

No match.