Implement BISERVER-8010
Merge pull request #113 from rpbouman/BISERVER-8010

Implement BISERVER-8010