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