INFUND-7855 Sync shib stability improvements.
INFUND-7855 Sync shib stability improvements.


Former-commit-id: 6f0fad7d42438727d63078e6d35b8bbbd64aa810
InnovateUKGitHub/innovation-funding-service,InnovateUKGitHub/innovation-funding-service,InnovateUKGitHub/innovation-funding-service,InnovateUKGitHub/innovation-funding-service,InnovateUKGitHub/innovation-funding-service