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