Always return current and previous row
Move bootstrapping changes to new bootstrap file
Merge pull request #75 from marcel-blonk/BRIDGE-65

Bridge 65
Integration upstream