595-57 partial commit