Address style concerns.
Use a pointer for this rather than copy by value
Merge branch 'gchpaco_2689' into next