6.2.2 support merged