Moved from aldrincb/stratus