minimal merge with stop_status_endpoints branch