Initial commit from BSP1.8