[merge] Fix last set of Nextstep changes.