Refactor merge onto dev