Fix the build
Merge branch '7.1.4' into HEAD
Refactor PublishedContentModelFactory