aofs-08 #546 (aofs-08)