aofs-12 #317 (aofs-12)