More changes to all the branches

Philips way of branching is weird. He loves branches. Loves hard
branches