@JoshRosen, can you please verify this patch Thanks!