aofs-09 #546 (aofs-09)