Merge contract and klarna into master