aofs-07 #544 (aofs-07)