Merge "442326 Added ability to view file contents in Folder context"