Merge pull request #50 from 30x/XAPID-1020

[XAPID-1020] fix race condition in snapshot/changes events