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