aofs-09 #628 (aofs-09)