basic function tampering detection
Merge branch 'master' into under-load