Uncommmitted changes from kompetensfredag.