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