aofs-08 #572 (aofs-08)