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