More work on p3 raptor image shape.
Make v1 raptor use p3 raptor image shape.