aofs-08 #593 (aofs-08)