auto6: wip#5.1 [forgotten files]