aofs-08 #554 (aofs-08)