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