MYLOC-55 - Prevent spy from leaking
Merge branch 'master' into MYLOC-59