Todd's AWESOME PULL REQUEST for Markup for FDM-082-111-000-136

This is the one that you SHOULD accept.