Feature/bmackall/lastworkingbranchbeforeserver