OOIION-1855,1340: Extended resource updates
Merge pull request #574 from mmeisinger/fix1855_uifp_r2

OOIION-1855,1340: Extended resource updates