One hell of a jumbo commit, for a too long-awaited massive update.