Hash membership correctly
Merge branch 'fix/slave-pids-error' into wip-branches