Items #530, 531, 532

@mbernier looks like I had v3 for these instead f v2