am ad0c59f8: (-s ours) am 874f33ce: Extract prefix and suffix html blocks to separate files DO NOT MERGE

* commit 'ad0c59f8bd5480d901fa2e881b89bf86141ea73b':
  Extract prefix and suffix html blocks to separate files DO NOT MERGE