Fix for #1671 - Adding [FromHeader] attribute

^ Could we get a work item to track this for RC?