Merge "Fix broken resource definition." into pi-dev