deps. Closes #2172. Closes #2173. Closes #2174. Closes #2175