Merge "Minor public.xml cleanup"