Merge "changes in DR_PubResourceTest"