Performance issues under 1.4.0 rc4

[terry]

This is now revolved, see Global state doesn't match local state on up to date folder