Tried to reduce the amount of branching in main

Change-Id: Ib9139ac74f49e8433d4743830c933f5c4d89c422
Merge "Tried to reduce the amount of branching in main"