Merge "Set static Dependency ref after all the Deps are set up." into pi-dev