aofs-10 #413 (aofs-10)