Merge "Fix resource directory references" into pi-dev