Merge branch 'for-3.7/board-removal' into for-3.7/cleanup2