Back porting to 1.10.x: N+1 select issue with Obs and ObsGroup -
TRUNK-4141