Lots of new code added to support the new IP/Award linking test scenario.
Last version that works with 5.1.1...
Merge with Abeheward and an additional change.