aofs-12 #541 (aofs-12)