4335 pull from staging

Is this guaranteed to only be run on the command line? Possibly make this a log statement instead