Merge all the work made on the the v2 design branch to master