Update feature base to 6927c96