piece_picker invariant check
merged fix from RC_0_16
client_test windows fix
merged changes from trunk