Issue #2300131 by Berdir, alexpott: Fixed EntityResolverManager instantiates objects unnecessarily.
Issue #2230091 by dawehner, Berdir, marthinal, martin107: Fixed Route rebuilding is not guaranteed to finish in time for the next request.