Merge "Remove the hostname from AFD when related to cluster"