Merge branch 'fog'