sync with master. TODO: look why multistep3 fails while it succeeds in master.