Added content of qaBoards2 branch