Todo list: 6.1

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
Todo list: 6.2.1

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
Todo list: 6.3.1

Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>