Merge "Unlink Functest and FDS tags"