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