Merge Acceptance tests branch