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