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