aofs-11 #586 (aofs-11)