am 874f33ce: Extract prefix and suffix html blocks to separate files DO NOT MERGE

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