merge jalando commit de pike