Merge floc_t into gmk_loc