No need for mockup-merge branch of pat-upload anymore