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