PR: 205126 Submitted by: vladimir.chukharev@gmail.com (maintainer) Approved by: mat (mentor) Differential Revision: D4437