merge changes on 26-implement-user-journey-tests