Forward port 1.3.1 changes
Remove 1.2.3 sections
Distribute test_setup.js