Commit all stuff from 62642d4dfdc179b5c8a924bf71cb49dc4cdc4956 that i forgot addit.