Merge 'viking-0.9.8'