re-include gemstone sections of baseline methods
sync baseline from gemstone branch