Merge "Add play recap back in to the end of plays" into feature/zuulv3