Merged in changes from esamir branch.