aofs-09 #586 (aofs-09)