Merge "Bug 1036 - Allow using container in case stmt to preserve uniqueness."