aofs-07 #546 (aofs-07)