branches: 1.1.34;move files from ../common/ that are only used in this directory to here
Sync with HEAD.