aofs-07 #593 (aofs-07)