Edits to board-8064
Board-8064 edits