Very minor code cleanup
Merge branch 'v1' into v2
Merge branch 'v2' into v3