The previous alpha with all the existing Federation changes merged.

Note: it remains to be verified that the federation issues in the backlog have been addressed in the changed code.