[#46120519] Ensure correct branching behaviour

Note: Will require updates to Gemfile/GemfileLock
before merging