Merge "adjust AAF for b64"