V1/test merge

Committed to old branch - this commit explicitly edits the conflicts for compatibility.