This is what I've checked in.  Testing continues ...

Andrew