Backend merge
Merge branch 'Backend'
Merge branch 'loader'
Some last minute changes that merging broke