Bugfix/4181 deploy to staging causes errors