Implemented medium data loading
Resolved merge conflicts
Fixed medium data loading
Merge remote-tracking branch 'upsteam/master'