Following the upstream changes to Products.GSProfile.