adaptations and some design fixes for production update

2 jobs for production in 6 seconds (queued for 6 seconds)
Status Job ID Name Coverage
  Deployment Production
passed #993110
manual
Production

00:00:06

passed #896318
manual
Production

00:00:06