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