aofs-10 #546 (aofs-10)