Fixed bugs regaring loading from distributions and protocols
Resolved merge conflict
Merge conflict