GOG PR 4.21.18