Merge pull request #300 from kurtwalker/master

BISERVER-8578
BISERVER-8106 - partially and totally were reversed