Fixes issue TA135
Issue TA135
issue TA135
ISSUE TA135
Merge pull request #498 from rpedde/TA135

Merged automatically by jenkins after successful gate test