Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev