Fix bamboo build failure from s2s fixes merge