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