The models were incorrectly merged (this would have been avoided if !927
was merged in, but that MR is still review) leading to a few spec failures.