Merge "Make sure resource references are resolved." into ics-mr1