Setting branches back to being the exact same. Working from stable. See merge request crafty-controller/crafty-commander!39