aofs-10 #563 (aofs-10)