[ffigen] Merge commit 'ac318a25ecd7bea6685f8b3f8cabbdea16519936' into stable-to-7-x