#1038 Preparing to finish fish on p2pfix branch