Early rebase design and implementation

[haidarally]

This was considered in PR : https://github.com/RiskProtocol/core-protocol/pull/72