[OS-BUILD PATCHv2 2/3] Add support for CI octopus merging