aofs-12 #418 (aofs-12)