Merge branch 'fix-configure_file-COPYONLY' into release
Merge branch 'release'