Merge conflicts between 9.16.20 and 9.16.33
branches: 1.2.2; 1.2.4;merge conflicts, add build glue.
branches: 1.1.1;Initial revision