Cilogon2 rebase

OOIION-1406

@jamie-cyber1 please review and merge