Merge "Initial changes to make folders accessible" into ics-mr1