Recovering support for anonymous access and tokens processing lost during unsuccessful merge.

In previous merge some features present in master were lost. This merge recovers them.