Issue 10157 type contents refactor

Re-open closed PR #10158