Remove the unused field inheritance and improve page load time.
Merge commit '342ad8ba823f87d07fdd032e53a87127238fb8ed'