Incorporate changes from dev into v2

What does the code in the MR do ?

Where should the reviewer start ?

How can the code be tested ?

When is the MR due for? (review deadline)

What issues are linked to the MR ?