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