Merge "Remove Octopus View"