aofs-12 #546 (aofs-12)