This can be made public now IMO