Refactor, improve Multipart model

refs #15674
I.e. in Scala 2.11.x