GTS: cherry-picks and collection usage (#186)