Context processors; fix SPOT-870, SPOT-871, SPOT-872