Merge fdct3d in Fista