merged Serializer infrastructure from SF version:
A lot of failing test by now