Merge "main/app: Only look to end of file if ':end' is specified, and not just ':'"