40191799
6c450101
* commit '4019179991bae66f72bae8e81c0f2399da4ee85e': DO NOT MERGE Cherry-pick dataSpace and BufferItem changes