Closes daiquiri-tomo#326 (closed) daiquiri-tomo#334 (closed) daiquiri-tomo#219 (closed) daiquiri-tomo#331 (closed)