Merge pull request #229 from webdetails/BISERVER-8856

BISERVER-8856