[OS-BUILD PATCH 1/2] Add support for CI octopus merging