Create branch for fpscand support