Merged dev into refactor-api but this merge appears to have broken something