refs #705 - merged Enterprise plugin
Merge branch 'FB_705_MERGE_ENTERPRISE_PLUGIN'