merge board-cp3dcg-storage into board-cp3dcg-storage