Merge "aflags: add new storage mode" into main