[dali_1.3.41] Merge branch 'devel/master'