Test against 1.6.0-beta1
Sync with upstream