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