aofs-09 #595 (aofs-09)