WICKET-4762 IResourceVersion should be based on final result

(cherry picked from commit d6135b5d03a3de3007721703780aa93910615914)