Fixup after rebase Correct bad merges Fixup docs Fix integration test Correct doc references to finance