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