Re-applying changes made previously as got lost in merge.
Supressing type conflict warnings caused by GitVersion