ETPP-36, ETPP-45, ETPP-46, ETPP-47, ETPP-48, ETPP-35

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