We are planning on adding support for both of these versions and we are currently in testing. If testing goes well you can expect to see this functionality added in the next CP release for both our 2016 and 9.6 versions.