Merge "Add the v16 to supported versions"