Merge "update "dont kill" api" into nyc-dev