aofs-10 #554 (aofs-10)