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