aofs-07 #567 (aofs-07)