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