[Issue #370][WIP] Switching to another branch