Merge "Standardise safety comments for unsafe blocks." into main