4335 pull from staging

could declare this at the module level seeing as we don't format at this point