Merge "storage: add missing bug_map" into main