Merge branch 'main' into feat/update-ttl-seconds-on-job-to-work-with-argocd

Author: ab-andresc