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