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