[BACKLOG-194] - Pull changes to FileResource and the work doen in BACKLO...

...G-194 into master.