Merge "Fix resource by name lookup" into pi-dev