Merge "Adding ability to list folder items in separate file" into ub-now-queens