In tandem with !906 (closed), will close #894 (closed), #1262 (closed), #1287 (closed), #1288 (closed).