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