Added Tenthwave code and software-based EC2 support for 9.5