aofs-07 #152 (aofs-07)