Merge performence improvement from master branch