Update platform support for 3.6