JBTM-1600 4_BRANCH doesn't use upstream