PR #812 - faiscadev/fakecloud