Merged changes in board class.