Merge "Add hacking check to enforce no client aliases"