Merge "Made a note that app names may not contain delimiter characters" into pi-dev