Reviewed By: @amirrosenfeld Differential Revision: D2488420
Reviewed By: @mkonicek Differential Revision: D2465929