Merge "Seperate ProgramRaster. Cleanup ProgramRaster and ProgramStore creation."