aofs-12 #569 (aofs-12)