aofs-09 #589 (aofs-09)