Added content of qaBoards2 branch commit 2