aofs-10 #586 (aofs-10)