merge 'refactor-board-pieces' into 'master'