Fabricthree 709

Merging FABRICTHREE-709 (for FABRIC-18 in new Jira) to master.