Merge "Adding bugfix flag for archiving bug extras" into main