merge app and request context (#5812)