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

OOIION-1855,1340: Extended resource updates