Merging despite it still being partially broken because I don't want this to be isolated in a random branch
C4267
C4244