Fix merge conflict with ksundbergs branch