[NEEDS MERGE] Whanganui Straight