TODO
Serializability convenience methods
NoResultMethodInvocationStrategy
Merge branch 'development'