aofs-12 #567 (aofs-12)