I forgot to check those check-boxes. Sorry, my fault. I wanted to do it too quickly. Second attempt to merge.