Account for cleared situation in 7.2 and 7.2.1 and for 7.3 final