595-77 & 595-92

Had to merge changes manually so please make sure your work didn't get
overwritten.