<rdar://problem/31171570>
Created attachment 305437 [details] Patch
Created attachment 305528 [details] Patch
Created attachment 305535 [details] Patch for landing