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