ETPP-33, ETPP-34, ETTP-37

Signed-off-by: Marcin Wiatr <mail.wichura@gmail.com>