Merge remote-tracking branches 'origin/development', 'origin/HEAD', 'origin/master' and 'origin/types' into types
fixed a bug related to log reading in record-replay