consolidated and rebased changes#244

sondreb merged 1 commit intoblock-core:masterblock-core/blockcore:masterfrom

MithrilMan:pr/persistenceMithrilMan/blockcore:pr/persistenceCopy head branch name to clipboard