Merge latest updates to main

Rolf Heynorequested to merge
staging into main

Updates to production environment

Merge request reports