#38: Upgrade to terminatur alpha7