Merge pull request #159 from DavidEichmann/T-13064