As published 2.0.7-pre