Merge in client access
Fix helpers
Merge branch 'extranet'