Summary: A public API for the feature forward-ported from 6u10.
Reviewed-by: yan

Summary: forward-port from 6u14, no public API is introduced
Reviewed-by: anthony, dcherepanov