Support V21R36A on F-11D