Merge "Inject InitStep members again before calling postRun." into stable-2.9