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