Upstream update on gs.content.layout