WIP
9s->10s
9s
10s
8s->9s
8s
rebased onto 531bc69b408145204d7e3da3ab2ac2eb199b11ce
:thumbsup:
Pull-Request has been merged by ngompa
WIP