Merge changes from gungnir