Bringing in bug fix from internal git