Merge "Add flag for folder settings support"