2.3/dev PSR field types

Looks like we get to celebrate early christmas. You can close this issue #2949