aofs-12 #419 (aofs-12)