Merge "Use changed getStatus interface" into nyc-dev