V2

Merged v2 from @francoisfrisch and resovled merge conflicts to make landing this easier