Pull request from Soleil (FL)

- Princeton tested at Soleil (3 instances)