Merge fixed from trond