DO NOT MERGE -- QA TEST BRANCH ONLY (replacement for PR#50)