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