ETPP-83, ETPP-84, ETPP-88

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