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