Updated PR #1841 for Microdata

This is PR #1841 updated with the current staging branch to assist with testing.  I make no assurances on the code's functionality; all I've done is merged up the current code base and resolved any merge conflicts that came up.