aofs-07 #412 (aofs-07)