Merge differences between 7.7.0 and 7.8.0
branches: 1.2.2; 1.2.4; 1.2.12; 1.2.14; 1.2.16; 1.2.18; 1.2.20; 1.2.22; 1.2.28;merge conflicts, adjust the build.
branches: 1.1.1;Initial revision