special branch of osd to fix overlay bugs