aofs-09 #623 (aofs-09)