Initial checkin for issue 2322