bc11511 (@45395)