aofs-11 #546 (aofs-11)