aofs-12 #568 (aofs-12)