aofs-07 #154 (aofs-07)