WEB-3025 - Split Context Listener in 2