poly_record may contain fields in leopard
Merge branch 'poly_record' into leopard