aofs-08 #574 (aofs-08)