Merge "Fix invitation request from persistent GC" into nyc-mr1-dev