aofs-09 #591 (aofs-09)