Pool of light

Cherry picking.