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