CNP-211 fix.
sync with upstream.