grn 17 ready to ship
merge