Make options param optional
Merge branch 'serializer-options' into 0-9-stable