Manually merge dpasi314