Merging sogko fixes