Pass container instance to resolving callbacks.
Fix conflicts and merge.