Fix for CAMEL-7498.  Most of this was already done, just adding a test h...

...ere