Revert "Revert "Changes to support V1.6""

This reverts commit b8e2a576e604cac14485b6f6c4cc9d078b84d852.