Imported r137

Watch statistics GENERIC output fix
Imported r139

Save command module order fix
Imported r140

Constructs-to-c code generation fix
Imported r141

not/and expression ordering fix
Imported r142

bload redefinition bug