GOG PR 6.16.18-6