[BACKLOG-194] - Pull changes to FileResource and the work done in BACKLOG-194 into master.