Merge pull request #1 from mdamour1976/BISERVER-8414

Biserver 8414
sfasfasfd