Pull in changes from fbernier