Initial v12 updates

More to come, this is not complete

Change-Id: I60a41848f8b18d19fcc9cb34b4da668e1278988e