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