Pull in Upstream Changes

New functionality.