aofs-07 #639 (aofs-07)