Update Assertion strategy to latest spec
Merge branch 'assertion-strategy-update' into aptible