WIP - IPv6 Container Support

This is a work in progress pull request based on the work previously done in PR-2974. This branch needs merged/rebased onto the master as its currently based on the 0.8 release.