aofs-09 #567 (aofs-09)