Merge "Changed setup intra recon to be row based"