Fix for BRIDGE-131
Fix for BRIDGE-132
Merge pull request #98 from alxdarksage/consent

Bug fixes