Fetched and merged latest, inc. cart edits, EC-branch1 has latest