Merge "Add support for publicAlternatives"