Merge of all the work with the past 11 days

- Fetch upstream
- Complete rebase of all commits and manual merge by Roman
- Adding small fix to use blocknr as key in chainDB