aofs-07 #436 (aofs-07)