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