aofs-11 #593 (aofs-11)