aofs-07 #523 (aofs-07)