Merge "Fix servlet response flows"