20110116_cherrypicking - vhew