Add preliminary 3.16.7 support

Signed-off-by: Alec Ari <neotheuser@ymail.com>