Merge pull request #7917 from super626/v3

bundle code adjustment
fix vs2013 compile error
fix release mode compile error
Merge pull request #7929 from andyque/fixVs2013CompileError

Fix vs2013 compile error