Merge "Emergency API review"