The scope of this ticket is :
- To merge the develop branch to durable history branch
- To determine which tests still needs to be skipped by using unit test skip construct "Temporarily disabled".
- To determine which asserts with string "FIXME - PM-1521" in their comments are still failing.