aofs-07 #574 (aofs-07)