replaced empty tag with self closing tag
Merge remote-tracking branch 'origin/develop' into develop