Add support for all 4.* releases