Manual merge from dev because too many conflicts and git is is more complicated than it needs to be.