Issue #2237 providing lock free schema