Commit branch with test SimplePortal support