t / t5100 / msg0016on commit octopus: make merge process simpler to follow (8133450)
   1and some content
   2