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