Update to gitlab 7c88958