aofs-11 #554 (aofs-11)