Fixed serialization issues
Merge remote-tracking branch 'origin/jsf-console-refactoring' into jsf-console-refactoring