aofs-09 #545 (aofs-09)