Merge origin/StubDao into StubDao