Merge "Rename small dirty detection flag" into main