Merging in @jxson haiku change

Merge + conflict fix.