aofs-09 #524 (aofs-09)