review

Pre-landing PR review. (gstack)