aofs-09 #554 (aofs-09)