rewrited response processing
merge f9b2618