Merge conflict. Fixed bug where retrieve from/until dates were accidentally removed.
Had to cherry pick and such.