aofs-07 #413 (aofs-07)