Octopus 2 package change - DO NOT MERGE