Merge new code

Get new change from blackrush