Upgrade to systest-0.8.7
Merge bug26046