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