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