New subsurface commits

Signed-off-by: Anton Lundin <glance@acc.umu.se>