PR, combining #50 #51 #57 #59 and jersey 2 switch