PR #819 - faiscadev/fakecloud