Merge pull request #18621 from kamil-tekiela/fix-doctype-on-arrays