manually migrated fixes to stage6