aofs-10 #590 (aofs-10)