t740 added an option of None for Service History
Merge branch 't740' into ooo_pilot