3dquiver rebranch

Replaces #2961