Merge "Add API flag for storage area API" into main