merge from octopus