Issue #5702: Update API