Branch Preparation

Final commit before branch will be split for other forms of testing,
while the current version continues to take its place.