Adding back some missing code

2 jobs for !64 with aws-integration in 31 minutes and 8 seconds (queued for 4 seconds)
latest merge request