If only one timespan filed is set, copy it to the empty value
Add tests
Merge branch 'APD-65-BOZ-3' into develop