aofs-10 #569 (aofs-10)