Merge pull request #90 from webdetails/5.0-CE

BISERVER-10530