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