[v2] Version 2 post-review housekeeping [pull #3]