Merge branch 'master' into GONRG-2966_Replace_legal_endpoint

4 jobs for GONRG-2966_Replace_legal_endpoint in 37 seconds (queued for 5 seconds)