fd-95 for 4.1 branch