I found that my problem was caused by an error in our entity annotation. Sorry for the false alarm, can we close this now?